$OpenBSD: patch-cmn_game_style_cpp,v 1.3 2017/05/02 23:26:32 espie Exp $
Index: cmn/game_style.cpp
--- cmn/game_style.cpp.orig
+++ cmn/game_style.cpp
@@ -29,19 +29,17 @@
 
 // Include Files
 #include "stdafx.h"
-extern "C" {
-#include <string.h>
-}
+#include <cstring>
 
 #if X11
-#include <strstream.h>
+#include <strstream>
 #endif
 
 #if WIN32
 #include <strstrea.h>
 #endif
 
-#include <iomanip.h>
+#include <iomanip>
 #include "utils.h"
 #include "coord.h"
 #include "world.h"
@@ -2680,7 +2678,7 @@ int ZigZag::new_level_check(int,WorldP world,LocatorP 
     HumanP human = locator->get_human(n);
     if (human) {
       // previous depth
-      int depthOld = (int)human->get_data();
+      intptr_t depthOld = (intptr_t)human->get_data();
       Id id = human->get_id();
 
       // Get physical for intelligence
